auto merge of #389 : alexcrichton/cargo/dev-dependency-lockfile, r=wycats

auto merge of #389 : alexcrichton/cargo/dev-dependency-lockfile, r=wycats

Previously an invocation of `cargo build` would generate a lockfile *without*
dev dependencies, but an invocation of `cargo test` would generate a lockfile
*with* dependencies. This causes odd problems and diffs with the lockfile.

This commit switches the resolve-to-be-a-lockfile to using all dependencies of a
package, while the resolve-to-be-compiled continues to use just the dependencies
needed for the current build.